merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 30 Nov 2011 06:19:27 +0000 (15:19 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 30 Nov 2011 06:19:27 +0000 (15:19 +0900)

Trivial merge